Merge from emacs-24; up to r111062
authorGlenn Morris <rgm@gnu.org>
Sat, 22 Dec 2012 19:09:52 +0000 (11:09 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 22 Dec 2012 19:09:52 +0000 (11:09 -0800)
commit122622add9e5f0ee8dd3af280eba3f7773daa176
treeafa4502374183585516864cf7f75fdef1fe6abc1
parent9ef351b9611a63e1736cba51ccfd30d885d45ee4
parent5fc83f7071a42302ee2856c0166904c008270d87
Merge from emacs-24; up to r111062
21 files changed:
doc/lispintro/ChangeLog
doc/lispintro/emacs-lisp-intro.texi
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/lispref/os.texi
doc/lispref/windows.texi
doc/misc/ChangeLog
doc/misc/Makefile.in
doc/misc/calc.texi
doc/misc/cl.texi
doc/misc/erc.texi
doc/misc/gnus.texi
doc/misc/mh-e.texi
doc/misc/ses.texi
doc/misc/srecode.texi
doc/misc/tramp.texi
doc/misc/url.texi
doc/misc/wisent.texi
doc/misc/woman.texi
src/ChangeLog
src/window.c